# This is a BitKeeper generated patch for the following project:
# Project Name: Linux kernel tree
# This patch format is intended for GNU patch command version 2.5 or higher.
# This patch includes the following deltas:
#	           ChangeSet	1.1153.67.24 -> 1.1153.67.25
#	arch/ia64/hp/common/sba_iommu.c	1.28    -> 1.28.1.1
#
# The following is the BitKeeper ChangeSet Log
# --------------------------------------------
# 03/09/08	torvalds@home.osdl.org	1.1237
# Merge bk://bk.arm.linux.org.uk/linux-2.6-rmk
# into home.osdl.org:/home/torvalds/v2.5/linux
# --------------------------------------------
# 03/09/08	davidm@tiger.hpl.hp.com	1.1153.67.25
# ia64: Drop unnecessary version check in sba_iommu.c.
# --------------------------------------------
#
diff -Nru a/arch/ia64/hp/common/sba_iommu.c b/arch/ia64/hp/common/sba_iommu.c
--- a/arch/ia64/hp/common/sba_iommu.c	Tue Sep  9 01:05:15 2003
+++ b/arch/ia64/hp/common/sba_iommu.c	Tue Sep  9 01:05:15 2003
@@ -227,12 +227,7 @@
 static struct ioc *ioc_list;
 static int reserve_sba_gart = 1;
 
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
 #define sba_sg_address(sg)	(page_address((sg)->page) + (sg)->offset)
-#else
-#define sba_sg_address(sg)	((sg)->address ? (sg)->address : \
-                                  page_address((sg)->page) + (sg)->offset)
-#endif
 
 #ifdef FULL_VALID_PDIR
 static u64 prefetch_spill_page;